Adwaita: transition :active buttons faster than the other states

https://bugzilla.gnome.org/show_bug.cgi?id=732134

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 365b6d96865fe7cdc1422fe41a383ce09bc57cc8..1fcf87840e2f8701f9c4adf94d6b111f8d64a9fb 100644 (file)
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -214,7 +214,7 @@ GtkLabel {
 
 .button {
   border-radius: 3px;
-//  transition: all 200ms ease-out;
+  transition: all 200ms ease-out;
   padding: 4px 6px;
   @include button(normal);
   &:hover, &.flat:hover {
@@ -223,6 +223,7 @@ GtkLabel {
   }
   &:active, &.flat:active {
     @include button(active);
+    transition-duration: 50ms;
   }
   &:backdrop, &.flat:backdrop {
     @include button(backdrop);

diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index ad800ef4031a395dcdd87c21e0df72c99eb41312..68c4b632ce7f5cb7b794f2d61b099abde3d84964 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -213,6 +213,7 @@
  ***********/
 .button {
   border-radius: 3px;
+  transition: all 200ms ease-out;
   padding: 4px 6px;
   border-width: 1px;
   border-style: solid;
@@ -240,7 +241,8 @@
     background-image: linear-gradient(to bottom, #212424, #2d3232 3%);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
-    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(238, 238, 236, 0.1); }
+    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(238, 238, 236, 0.1);
+    transition-duration: 50ms; }
   .button:backdrop, .button.flat:backdrop {
     border-width: 1px;
     border-style: solid;

diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index e43fae01501efb54fc2b2eec8d9bda1209d5995a..86c8e8e8adb78e5fc17e7af864a4add215ee8e64 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -213,6 +213,7 @@
  ***********/
 .button {
   border-radius: 3px;
+  transition: all 200ms ease-out;
   padding: 4px 6px;
   border-width: 1px;
   border-style: solid;
@@ -240,7 +241,8 @@
     background-image: linear-gradient(to bottom, #c7c7c7, #d1d1d1 3%, lightgray);
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px white; }
+    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px white;
+    transition-duration: 50ms; }
   .button:backdrop, .button.flat:backdrop {
     border-width: 1px;
     border-style: solid;